From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 Mar 2017 19:27:56 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1564
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d86bcedd880b3cb6383641082d406075aa6e70e2;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

3993dc5 Fix auto-save-file-name problem in Tramp on MS Windows. Do no...
---

d86bcedd880b3cb6383641082d406075aa6e70e2